Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only suggest turbofish in patterns if we may recover #115785

Merged
merged 1 commit into from
Sep 13, 2023
Merged

Only suggest turbofish in patterns if we may recover #115785

merged 1 commit into from
Sep 13, 2023

Conversation

fmease
Copy link
Member

@fmease fmease commented Sep 12, 2023 •
edited
Loading

Fixes [after backport] #115780.

CC #103534.

@rustbot
Copy link
Collaborator

rustbot commented Sep 12, 2023

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 12, 2023
@fmease fmease added the A-parser Area: The parsing of Rust source code to an AST label Sep 12, 2023
fmease
fmease commented Sep 12, 2023
View reviewed changes
tests/ui/parser/issues/issue-115780-pat-lt-bracket-in-macro-call.rs
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Originally I wanted to place this file into parser/ directly but its file entry limit of 900 has been reached

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Naming of this file mirrors naming in #114300.

@wesleywiser
Copy link
Member

Thanks for fixing the regression so quickly @fmease!

@bors r+

@bors
Copy link
Contributor

bors commented Sep 12, 2023

📌 Commit 3ed77e9 has been approved by wesleywiser

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 12, 2023
@compiler-errors
Copy link
Member

This should definitely be beta backported, imo

@compiler-errors compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 12, 2023
@bors
Copy link
Contributor

bors commented Sep 13, 2023

⌛ Testing commit 3ed77e9 with merge 367db83...

@bors
Copy link
Contributor

bors commented Sep 13, 2023

☀️ Test successful - checks-actions
Approved by: wesleywiser
Pushing 367db83 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 13, 2023
@bors bors merged commit 367db83 into rust-lang:master Sep 13, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 13, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (367db83): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 632.182s -> 631.641s (-0.09%)
Artifact size: 317.96 MiB -> 317.90 MiB (-0.02%)

@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 14, 2023
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 16, 2023
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.74.0, 1.73.0 Sep 16, 2023
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Sep 16, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 17, 2023
@bors
Auto merge of rust-lang#115901 - Mark-Simulacrum:beta-backport, r=Mar…
9b95397 
…k-Simulacrum

[beta] backport

This PR backports:

- rust-lang#115785: Only suggest turbofish in patterns if we may recover
- rust-lang#115527: Don't require `Drop` for `[PhantomData<T>; N]` where `N` and `T` are generic, if `T` requires `Drop`
- rust-lang#115389: fix(resolve): update def if binding is warning ambiguity
- rust-lang#115215: Remove assert that checks type equality

r? `@Mark-Simulacrum`
@fmease fmease deleted the fix-pat-regression branch September 18, 2023 10:11
@fmease fmease mentioned this pull request Sep 18, 2023
Closed
@fmease fmease mentioned this pull request Jun 1, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wesleywiser wesleywiser wesleywiser approved these changes

Assignees

@wesleywiser wesleywiser

Labels
A-parser Area: The parsing of Rust source code to an AST beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.
8 participants
@fmease @rustbot @wesleywiser @bors @compiler-errors @rust-timer @apiraino @Mark-Simulacrum